From: Alex Williamson <alex.williamson@hp.com>
Date: Fri, 12 Oct 2007 19:56:42 +0000 (-0600)
Subject: [IA64] Avoid set cr.ivt when context switch if possible
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14879
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=1812330211f4c420303167b177d07323ff47716d;p=xen.git

[IA64] Avoid set cr.ivt when context switch if possible

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 6d99bcaccf..db126bb88d 100644
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -206,7 +206,8 @@ void schedule_tail(struct vcpu *prev)
 		migrate_timer(&current->arch.arch_vmx.vtm.vtm_timer,
 		              current->processor);
 	} else {
-		ia64_set_iva(&ia64_ivt);
+		if (VMX_DOMAIN(prev))
+			ia64_set_iva(&ia64_ivt);
 		load_region_regs(current);
 		ia64_set_pta(vcpu_pta(current));
 		vcpu_load_kernel_regs(current);
@@ -259,7 +260,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next)
         struct domain *nd;
         extern char ia64_ivt;
 
-        ia64_set_iva(&ia64_ivt);
+        if (VMX_DOMAIN(prev))
+            ia64_set_iva(&ia64_ivt);
 
         nd = current->domain;
         if (!is_idle_domain(nd)) {
@@ -911,7 +913,7 @@ int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c)
 			             tr->dtrs[i].rid);
 		}
 		v->arch.event_callback_ip = c.nat->event_callback_ip;
-		v->arch.iva = c.nat->regs.cr.iva;
+		vcpu_set_iva(v, c.nat->regs.cr.iva);
 	}
 
 	return 0;